Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 25 Aug 2010 22:44:39 +0000 (22:44 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 25 Aug 2010 22:44:39 +0000 (22:44 +0000)
commit4ab4d2c715e0a66d965f0bec8ab97578d04a455e
treef040797003fc4196ad2a50642151db9f39a18c7c
parenta5feec3cc5602d2a5327d6b74dc610ed14043860
parentd4940d041c28bc959a89df9b450092e9584c68e8
Merge from mainline.